New upstream release

- Update debian/copyright
- Update disabled ostree-boot packaging for new systemd generator
- Add new ABI to symbols file

diff --git a/debian/changelog b/debian/changelog
index 363f693c511fe72c18a3e4a17e69f5d4989139d4..2cf19b2c2b3d86bb2215fdc011bc475b3f5d1f15 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ostree (2017.6-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Update debian/copyright
+    - Update disabled ostree-boot packaging for new systemd generator
+    - Add new ABI to symbols file
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 24 May 2017 20:50:51 +0100
+
 ostree (2017.5-1) experimental; urgency=high
 
   * New upstream release

diff --git a/debian/copyright b/debian/copyright
index f2a64f3c0cc66edb81d7ec2c2a2391c11088a8ab..ad8165aea23154b7f819da7fad49ae1205d529f1 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,6 +20,7 @@ Copyright:
  © 2014 Owen Taylor <otaylor@redhat.com>
  © 2015 Dan Nicholson <nicholson@endlessm.com>
  © 2015 Canonical Ltd.
+ © 2017 Endless Mobile, Inc.
 License: LGPL-2+
 
 Files:

diff --git a/debian/libostree-1-1.symbols b/debian/libostree-1-1.symbols
index 540bd7d6015d7f7de3c695ae45fe8612bd9e6a05..120cbe107289ff76fe6552d3ef8a1fee6a3ed276 100644 (file)
--- a/debian/libostree-1-1.symbols
+++ b/debian/libostree-1-1.symbols
@@ -11,16 +11,21 @@ libostree-1.so.1 libostree-1-1 #MINVER#
  LIBOSTREE_2017.2@LIBOSTREE_2017.2 2017.2
  LIBOSTREE_2017.3@LIBOSTREE_2017.3 2017.3
  LIBOSTREE_2017.4@LIBOSTREE_2017.4 2017.4
+ LIBOSTREE_2017.6@LIBOSTREE_2017.6 2017.6
  ostree_async_progress_finish@LIBOSTREE_2016.3 2016.4
+ ostree_async_progress_get@LIBOSTREE_2017.6 2017.6
  ostree_async_progress_get_status@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_get_type@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_get_uint64@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_get_uint@LIBOSTREE_2016.3 2016.4
+ ostree_async_progress_get_variant@LIBOSTREE_2017.6 2017.6
  ostree_async_progress_new@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_new_and_connect@LIBOSTREE_2016.3 2016.4
+ ostree_async_progress_set@LIBOSTREE_2017.6 2017.6
  ostree_async_progress_set_status@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_set_uint64@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_set_uint@LIBOSTREE_2016.3 2016.4
+ ostree_async_progress_set_variant@LIBOSTREE_2017.6 2017.6
  ostree_bootconfig_parser_clone@LIBOSTREE_2016.3 2016.4
  ostree_bootconfig_parser_get@LIBOSTREE_2016.3 2016.4
  ostree_bootconfig_parser_get_type@LIBOSTREE_2016.3 2016.4

diff --git a/debian/ostree-boot.install b/debian/ostree-boot.install
index ed9ffc60f8d431984d3ff8b09059930e0e847e2e..fd06f419202e6dcd8914db4370d3070519fb342e 100644 (file)
--- a/debian/ostree-boot.install
+++ b/debian/ostree-boot.install
@@ -1,5 +1,6 @@
 etc/dracut.conf.d/ostree.conf
 etc/grub.d/15_ostree
+lib/systemd/system-generators/ostree-system-generator
 lib/systemd/system/ostree-prepare-root.service
 lib/systemd/system/ostree-remount.service
 usr/lib/dracut/modules.d/98ostree

diff --git a/debian/rules b/debian/rules
index 6fb72a67005f30051d926907744c4c62b038670c..902ca253a972f5f5db3481ec19945fc3708b8194 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ override_dh_auto_configure:
                --with-dracut \
                --with-grub2 \
                --with-grub2-mkconfig-path=/usr/sbin/grub-mkconfig \
+               --with-systemdsystemgeneratordir=/lib/systemd/system-generators \
                --with-systemdsystemunitdir=/lib/systemd/system \
                $(NULL)
 
@@ -48,6 +49,7 @@ override_dh_install:
        # debian/ostree-boot.* and https://bugs.debian.org/824650
        rm -f debian/tmp/etc/dracut.conf.d/ostree.conf
        rm -f debian/tmp/etc/grub.d/15_ostree
+       rm -f debian/tmp/lib/systemd/system-generators/ostree-system-generator
        rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service
        rm -f debian/tmp/lib/systemd/system/ostree-remount.service
        rm -fr debian/tmp/usr/lib/dracut/modules.d/98ostree/